diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index ff2606d7cefed5d8397cd28ef08c9fe82513aa52..0b631a423df2602733bbc042a8fe4a0fda7cd8cd 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -2273,10 +2273,10 @@ configure_networking
 admin_user_sudo
 create_generic_image
 atheros_wifi
+continue_installation
 if [[ "$MACHINE" == 'beagle'* ]]; then
     beaglebone_flasher "$MACHINE"
 fi
-continue_installation
 image_install_nodejs
 image_install_myqr
 initialise_mesh
diff --git a/src/freedombone-utils-flasher b/src/freedombone-utils-flasher
index 03f3dec2f13e21443fbedc4739e62511339f6850..41d2a11e5d1dc610fe26cd4ff3435f0c9d7247f4 100755
--- a/src/freedombone-utils-flasher
+++ b/src/freedombone-utils-flasher
@@ -55,22 +55,17 @@ function beaglebone_flasher {
     fi
 
     # shellcheck disable=SC2086
-    if [ -f ~/${PROJECT_NAME}/image_build/emmc_functions.sh ]; then
+    if [ -f $rootdir/root/${PROJECT_NAME}/image_build/emmc_functions.sh ]; then
         # shellcheck disable=SC2086
-        cp ~/${PROJECT_NAME}/image_build/emmc_functions.sh "$rootdir$EMMC_DIR/functions.sh"
+        cp $rootdir/root/${PROJECT_NAME}/image_build/emmc_functions.sh "$rootdir$EMMC_DIR/functions.sh"
     else
-        if [ -f /root/${PROJECT_NAME}/image_build/emmc_functions.sh ]; then
+        if [ "$rootdir" ]; then
             # shellcheck disable=SC2086
-            cp /root/${PROJECT_NAME}/image_build/emmc_functions.sh "$rootdir$EMMC_DIR/functions.sh"
+            chroot "$rootdir" $INSTALL_PACKAGES wget rsync
+            chroot "$rootdir" wget "https://code.freedombone.net/bashrc/${PROJECT_NAME}/raw/master/image_build/emmc_functions.sh" -O "$EMMC_DIR/functions.sh"
         else
-            if [ "$rootdir" ]; then
-                # shellcheck disable=SC2086
-                chroot "$rootdir" $INSTALL_PACKAGES wget rsync
-                chroot "$rootdir" wget "https://code.freedombone.net/bashrc/${PROJECT_NAME}/raw/master/image_build/emmc_functions.sh" -O "$EMMC_DIR/functions.sh"
-            else
-                $INSTALL_PACKAGES wget rsync
-                wget "https://code.freedombone.net/bashrc/${PROJECT_NAME}/raw/master/image_build/emmc_functions.sh" -O "$rootdir$EMMC_DIR/functions.sh"
-            fi
+            $INSTALL_PACKAGES wget rsync
+            wget "https://code.freedombone.net/bashrc/${PROJECT_NAME}/raw/master/image_build/emmc_functions.sh" -O "$rootdir$EMMC_DIR/functions.sh"
         fi
     fi
     if [ ! -f "$rootdir$EMMC_DIR/functions.sh" ]; then