diff --git a/51-android.rules b/51-android.rules
index abf432b..116dc63 100644
--- a/51-android.rules
+++ b/51-android.rules
@@ -499,13 +499,13 @@ ATTR{idVendor}=="2833", ENV{adb_user}="yes"
 # OnePlus(Oreo)
 ATTR{idVendor}!="2a70", GOTO="not_OnePlus"
 #   OnePlus 6, 4ee1=charging, 4ee2=MTP+debug, 4ee6=PTP+debug, 4ee7=charging+debug
-ATTR{idProduct}=="4ee2", ENV{adb_adb}="yes"
-ATTR{idProduct}=="4ee6", ENV{adb_adb}="yes"
-ATTR{idProduct}=="4ee7", ENV{adb_adb}="yes"
+ATTR{idProduct}=="4ee2", GOTO="go_adbmtp"
+ATTR{idProduct}=="4ee6", GOTO="go_adbptp"
+ATTR{idProduct}=="4ee7", GOTO="go_adb"
 #   OnePlus Nord N10 4G USB tethering mode
-ATTR{idProduct}=="9024", ENV{adb_adb}="yes"
+ATTR{idProduct}=="9024", GOTO="go_adbrndis"
 #   OnePlus 3T with Oreo MIDI mode 90bb=adb+midi, 9011=MTP, 904e=PTP
-ATTR{idProduct}=="90bb", ENV{adb_adb}="yes"
+ATTR{idProduct}=="90bb", GOTO="go_adbmidi"
 ATTR{idProduct}=="9011", SYMLINK+="android_adb"
 ATTR{idProduct}=="904e", SYMLINK+="android_adb"
 GOTO="android_usb_rule_match"
@@ -514,7 +514,7 @@ LABEL="not_OnePlus"
 # Oppo
 ATTR{idVendor}!="22d9", GOTO="not_Oppo"
 #   Find 5 (2767=debug)
-ATTR{idProduct}=="2767", ENV{adb_adb}="yes"
+ATTR{idProduct}=="2767", GOTO="go_adb"
 #   Realme 8
 ATTR{idProduct}=="2769", ENV{adb_adb}="yes"
 ATTR{idProduct}=="2764", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1"
@@ -527,7 +527,7 @@ ATTR{idProduct}=="200e", ENV{adb_user}="yes"
 ATTR{idProduct}=="2028", ENV{adb_user}="yes"
 ATTR{idProduct}=="2026", ENV{adb_user}="yes"
 #   OnePlus 8T (22d9:2771=adb,PTP, 22d9:2772=adb,MTP)
-ATTR{idProduct}=="2771", ENV{adb_adb}="yes"
+ATTR{idProduct}=="2771", GOTO="go_adbptp"
 ATTR{idProduct}=="2772", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1"
 GOTO="android_usb_rule_match"
 LABEL="not_Oppo"
@@ -599,16 +599,16 @@ LABEL="not_Qualcomm"
 # Razer USA, Ltd.
 ATTR{idVendor}!="1532", GOTO="not_Razer"
 #   Razer Phone 2
-ATTR{idProduct}=="9050", ENV{adb_adbfast}="yes"
-ATTR{idProduct}=="9051", ENV{adb_adb}="yes"
-GOTO="android_usb_rule_match"
+ATTR{idProduct}=="9050", GOTO="go_adbfast"
+ATTR{idProduct}=="9051", GOTO="go_adb"
+GOTO="android_usb_rules_end"
 LABEL="not_Razer"
 
 # Research In Motion, Ltd.
 ATTR{idVendor}!="0fca", GOTO="not_RIM"
 #   BlackBerry DTEK60
-ATTR{idProduct}=="8042", ENV{adb_fastboot}="yes"
-GOTO="android_usb_rule_match"
+ATTR{idProduct}=="8042", GOTO="go_fastboot"
+GOTO="android_usb_rules_end"
 LABEL="not_RIM"
 
 # Samsung
@@ -915,6 +915,7 @@ ENV{adb_adbmtp}=="yes", ENV{adb_adb}="yes", SYMLINK+="libmtp-%k", ENV{ID_MTP_DEV
 ENV{adb_adbptp}=="yes", ENV{adb_adb}="yes"
 ENV{adb_adbtet}=="yes", ENV{adb_adb}="yes"
 ENV{adb_adbmidi}=="yes", ENV{adb_adb}="yes", SYMLINK+="android_midi", SYMLINK+="android_midi0%n"
+ENV{adb_adbrndis}=="yes", ENV{adb_adb}="yes"
 ENV{adb_adb}=="yes", ENV{adb_user}="yes", SYMLINK+="android_adb"
 ENV{adb_fast}=="yes", SYMLINK+="android_fastboot"