diff --git a/addons/GR/functions/fn_doautopsy.sqf b/addons/GR/functions/fn_doautopsy.sqf
index 8e51aca..b3ce8b7 100644
--- a/addons/GR/functions/fn_doautopsy.sqf
+++ b/addons/GR/functions/fn_doautopsy.sqf
@@ -19,7 +19,7 @@ if(_player getVariable ["ace_medical_medicClass", 0] == 2) then {
 } else {
 	_nearObjs = _target nearObjects 15;
 	{
-		if(_x getVariable ["ace_medical_isMedicalFacility", false] == true) exitWith { _medicF = true };
+		if(_x getVariable ["ace_medical_isMedicalFacility", false] != -1) exitWith { _medicF = true };
 	} forEach _nearObjs;
 };
 
diff --git a/addons/GR/functions/fn_initCBA.sqf b/addons/GR/functions/fn_initCBA.sqf
index feee4bd..50b8182 100644
--- a/addons/GR/functions/fn_initCBA.sqf
+++ b/addons/GR/functions/fn_initCBA.sqf
@@ -44,7 +44,7 @@ GR_AUTOPSY_DOCTORS=2;
     "LIST",
 	["Who can perform autopsies?","Choose which class(es) can perform basic autopsies."],
 	"Guilt & Remembrance",
-	[[GR_AUTOPSY_ANYONE,GR_AUTOPSY_MEDICS,GR_AUTOPSY_DOCTORS],["Anyone","Medics+Doctors","Doctors only"],2]
+	[[GR_AUTOPSY_ANYONE,GR_AUTOPSY_MEDICS,GR_AUTOPSY_DOCTORS],["Anyone","Medics+Doctors","Doctors only"],1]
 ] call CBA_fnc_AddSetting;
 
 [