diff --git a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests
index 12a92e5..f898776 100755
--- a/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests
+++ b/FunKey/board/funkey/rootfs-overlay/usr/local/sbin/assembly_tests
@@ -44,9 +44,6 @@ function function_magnet_detected_ok {
 	## Kill scheduled shutdown
 	pkill sched_shutdown
 
-	## Kill the funkey_prod_screen binary
-	killall -s USR1 "${PROD_SCREEN_BIN} > /dev/null 2>&1
-
 	## Write magnet_detected file
 	if $test_failed; then
 		echo "1" > $MAGNET_DETECTED_FILE
@@ -67,7 +64,7 @@ function function_magnet_detected_ko {
 	echo "ERROR: Caught SIGUSR1 signal (magnet detected!)"
 
 	## Kill the funkey_prod_screen binary
-	killall -s USR1 "${PROD_SCREEN_BIN} > /dev/null 2>&1
+	killall -s USR1 "${PROD_SCREEN_BIN}" > /dev/null 2>&1
 	sync
 }
 
@@ -223,7 +220,7 @@ function launch_tests_up_until_magnet {
 	sync
 
 	# Catch SIGUSR1 events
-	trap function_magnet_detected_ok SIGUSR1
+	#trap function_magnet_detected_ok SIGUSR1
 
 	## Launch prod screen test magnet
 	echo "TEST MAGNET:"
@@ -231,8 +228,15 @@ function launch_tests_up_until_magnet {
 	$PROD_SCREEN_BIN MAGNET  2>&1
 	res="$?"
 	echo "	$res" 
+
+	## Register ourself back as the running FunKey task for receiving USR1
+	## signal for shutting down
+	echo $$ > "/var/run/funkey.pid"
+
+	# check magnet test result
 	if [[ "$res" == "0" ]]; then
 		echo "	OK" 
+		function_magnet_detected_ok
 	else
 		echo "	FAILED" 
 		test_failed=true
diff --git a/FunKey/package/ProdScreens/ProdScreens.mk b/FunKey/package/ProdScreens/ProdScreens.mk
index 0037a14..0c7267a 100644
--- a/FunKey/package/ProdScreens/ProdScreens.mk
+++ b/FunKey/package/ProdScreens/ProdScreens.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PRODSCREENS_VERSION = FunKey-ProdScreens-FunKey-1.1.0
+PRODSCREENS_VERSION = FunKey-ProdScreens-FunKey-1.1.1
 PRODSCREENS_SITE_METHOD = git
 PRODSCREENS_SITE = https://github.com/FunKey-Project/FunKey-ProdScreens.git
 PRODSCREENS_SITE_LICENSE = GPL-2.1+