diff --git a/xCAT-server/lib/xcat/plugins/kit.pm b/xCAT-server/lib/xcat/plugins/kit.pm
index 2da8ee5ef..864dfed1e 100644
--- a/xCAT-server/lib/xcat/plugins/kit.pm
+++ b/xCAT-server/lib/xcat/plugins/kit.pm
@@ -473,15 +473,17 @@ sub assign_to_osimage
                              }
                         }
 
+                        my @newlines;
                         foreach my $line (@ls) {
                             if ($line =~ /^#ENV:.+=.+#$/) {
                                 chomp($line);
                                 $line =~ s/^#ENV://;
                                 $line =~ s/#$//;
+                                push @newlines, $line;
                             }
                         }
 
-                        $deployparams = join ' ', @ls;
+                        $deployparams = join ' ', @newlines;
 
                         if (open(NEWLIST, ">>", "$installdir/osimages/$osimage/kits/KIT_COMPONENTS.postinstall")) {
                             if ($deployparams) {