diff --git a/CommonInstaller b/CommonInstaller
index aeb2f3a..8cb64be 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -559,7 +559,7 @@ magisk_install_finish () {
 		;;
 	esac
 
-	if [ ! -z ${CUSTOM_FONT} -a "${nanodroid_fonts}" -eq 1 ]; then
+	if [ "${nanodroid_fonts}" -eq 1 -a ! -z ${CUSTOM_FONT} ]; then
 		ui_print " << Restore NanoDroid-Font (${CUSTOM_FONT})"
 		if [ "${ROM_NO_XBIN}" -eq 1 ]; then
 			${MODPATH}/system/bin/nanodroid-font -s "${CUSTOM_FONT}"