bin/i2cssh in i2cssh-1.13.0 vs bin/i2cssh in i2cssh-1.13.1

@@ -60,10 +60,12 @@
             # We have some global env so copy it
             @ssh_environment << @ssh_environment.first.clone
         end
 
         @ssh_environment.last.merge!(config_hash["environment"].inject({}){|m, v| m.merge(v)})
+    else
+        @ssh_environment << {}
     end
 
 end
 
 if File.exists?(@config_file) 
@@ -235,18 +237,16 @@
 # Otherwise we have a list of hosts
 elsif ARGV.length > 1 
     if opts_from_cmdline[:tabs_nogroup] 
         ARGV.each do |serv|
             @servers << [serv]
-            if @i2_options.size > 1 # We added stuff in with cmdline options
                 @i2_options << @i2_options.first.clone
                 if @ssh_environment.empty?
                     @ssh_environment << {}
                 else
                     @ssh_environment << @ssh_environment.first.clone
                 end
-            end
         end 
     else
         @servers << ARGV
         if @i2_options.size > 1 # We added stuff in with cmdline options
             @i2_options << @i2_options.first.clone
@@ -284,7 +284,8 @@
 if @servers.empty?
     puts "ERROR: no servers given"
     puts optparse.help
     exit
 end
+
 
 I2Cssh.new @servers, ssh_options, @i2_options, @ssh_environment