diff --git a/setup-ngxblocker b/setup-ngxblocker
index b4fd129ee..42ef42c93 100755
--- a/setup-ngxblocker
+++ b/setup-ngxblocker
@@ -219,8 +219,11 @@ find_line() {
 
 	case "$first_last" in
 		# ignore file #comments
-		first) grep -nE "^[ ]+$find_str" $file | head -n1 | awk -F: '{print $1}';;
-		 last) grep -nE "^[ ]+$find_str" $file | tail -n1 | awk -F: '{print $1}';;
+		#first) grep -nE "^[ ]+$find_str" $file | head -n1 | awk -F: '{print $1}';;
+		#last) grep -nE "^[ ]+$find_str" $file | tail -n1 | awk -F: '{print $1}';;
+		# REVERTING TO ORIGINAL WORKING METHOD
+		first) awk "/$find_str/{ print NR; exit }" $file;;
+		last) awk "/$find_str/{ print NR }" $file | tail -n1;;
 	esac
 }