diff --git a/mod/Cyberware.esm b/mod/Cyberware.esm
index bccb2e9..922dca5 100644
Binary files a/mod/Cyberware.esm and b/mod/Cyberware.esm differ
diff --git a/src/CWxScannerOnScan.gek b/src/CWxScannerOnScan.gek
index 818ac30..f6fc0b6 100644
--- a/src/CWxScannerOnScan.gek
+++ b/src/CWxScannerOnScan.gek
@@ -11,7 +11,7 @@ begin function { iControlID }
 
 	call CWxScannerStopText
 
-	set CWxScannerTextQuest.curTarget to GetCrosshairRefEx
+	set CWxScannerTextQuest.curTarget to ObjectUnderReticle 0 8192
 	SetStage CWxScannerTextQuest 1
 
 end
diff --git a/src/CWxScannerQuestScript.gek b/src/CWxScannerQuestScript.gek
index f73fd77..38aedcc 100644
--- a/src/CWxScannerQuestScript.gek
+++ b/src/CWxScannerQuestScript.gek
@@ -11,7 +11,7 @@ begin GameMode
 		return
 	endif
 
-	set rNewTarget to GetCrosshairRefEx
+	set rNewTarget to ObjectUnderReticle 0 8192
 
 	if rTarget == rNewTarget