diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index 470b568..20b7fae 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -580,17 +580,16 @@ class ImageCreator(object):
         for repo in kickstart.get_repos(self.ks, repo_urls):
             (name, baseurl, mirrorlist, proxy, inc, exc, cost, sslverify) = repo
             subprocess.call(["/usr/sbin/urpmi.addmedia", "--urpmi-root", urpmi_conf, name, baseurl])
-            packages = self.ks.handler.packages.packageList
-            if "basesystem" in packages:
-                print "Basesystem should be installed first"
-                if "kernel-nrj-desktop-latest" in packages:
-                    subprocess.call(["/usr/sbin/urpmi", "--auto", "--split-length", "0", "--fastunsafe", "--nolock", "--ignorearch", "--no-verify-rpm", "--no-suggests", "--urpmi-root", urpmi_conf, "--root", self._instroot] + ['basesystem', 'kernel-nrj-desktop-latest'])
-                else:
-                    subprocess.call(["/usr/sbin/urpmi", "--auto", "--split-length", "0", "--fastunsafe", "--nolock", "--ignorearch", "--no-verify-rpm", "--no-suggests", "--urpmi-root", urpmi_conf, "--root", self._instroot] + ['basesystem'])
-            
-            
-            print "Now let's install all other packages"
-            subprocess.call(["/usr/sbin/urpmi", "--auto", "--no-suggests", "--fastunsafe", "--debug", "--no-verify", "--urpmi-root", urpmi_conf, "--root", self._instroot] + packages)
+        packages = self.ks.handler.packages.packageList
+        if "basesystem" in packages:
+            print "Basesystem should be installed first"
+            if "kernel-nrj-desktop-latest" in packages:
+                subprocess.call(["/usr/sbin/urpmi", "--auto", "--split-length", "0", "--fastunsafe", "--nolock", "--ignorearch", "--no-verify-rpm", "--no-suggests", "--urpmi-root", urpmi_conf, "--root", self._instroot] + ['basesystem', 'kernel-nrj-desktop-latest'])
+            else:
+                subprocess.call(["/usr/sbin/urpmi", "--auto", "--split-length", "0", "--fastunsafe", "--nolock", "--ignorearch", "--no-verify-rpm", "--no-suggests", "--urpmi-root", urpmi_conf, "--root", self._instroot] + ['basesystem'])
+
+        print "Now let's install all other packages"
+        subprocess.call(["/usr/sbin/urpmi", "--auto", "--no-suggests", "--fastunsafe", "--debug", "--no-verify", "--urpmi-root", urpmi_conf, "--root", self._instroot] + packages)
 
     def _run_post_scripts(self):
         for s in kickstart.get_post_scripts(self.ks):