diff --git a/addons/common/functions/fnc_canGetInPosition.sqf b/addons/common/functions/fnc_canGetInPosition.sqf
index 859d8ed461..5ac4c527fd 100644
--- a/addons/common/functions/fnc_canGetInPosition.sqf
+++ b/addons/common/functions/fnc_canGetInPosition.sqf
@@ -69,7 +69,7 @@ switch (_position) do {
 
   case "gunner" : {
     private "_turretConfig";
-    _turret = [typeOf _vehicle] call FUNC(getTurretGunner);
+    _turret = [_vehicle] call FUNC(getTurretGunner);
     if (_turret isEqualTo []) exitWith {false};
 
     _turretConfig = [_config, _turret] call FUNC(getTurretConfigPath);
@@ -82,7 +82,7 @@ switch (_position) do {
 
   case "commander" : {
     private "_turretConfig";
-    _turret = [typeOf _vehicle] call FUNC(getTurretCommander);
+    _turret = [_vehicle] call FUNC(getTurretCommander);
     if (_turret isEqualTo []) exitWith {false};
 
     _turretConfig = [_config, _turret] call FUNC(getTurretConfigPath);
@@ -95,7 +95,7 @@ switch (_position) do {
 
   case "copilot" : {
     private "_turretConfig";
-    _turret = [typeOf _vehicle] call FUNC(getTurretCopilot);
+    _turret = [_vehicle] call FUNC(getTurretCopilot);
     if (_turret isEqualTo []) exitWith {false};
 
     _turretConfig = [_config, _turret] call FUNC(getTurretConfigPath);
@@ -108,7 +108,7 @@ switch (_position) do {
 
   case "turret" : {
     private ["_turrets", "_turretConfig"];
-    _turrets = [typeOf _vehicle] call FUNC(getTurretsOther);
+    _turrets = [_vehicle] call FUNC(getTurretsOther);
 
     if (_index != -1 && {_turret = _turrets select _index;
       CANGETINTURRETINDEX
@@ -136,7 +136,7 @@ switch (_position) do {
 
   case "ffv" : {
     private ["_turrets", "_turretConfig"];
-    _turrets = [typeOf _vehicle] call FUNC(getTurretsFFV);
+    _turrets = [_vehicle] call FUNC(getTurretsFFV);
 
     if (_index != -1 && {_turret = _turrets select _index;
       CANGETINTURRETINDEX
diff --git a/addons/common/functions/fnc_getInPosition.sqf b/addons/common/functions/fnc_getInPosition.sqf
index 0cfce1e124..062cc6cae4 100644
--- a/addons/common/functions/fnc_getInPosition.sqf
+++ b/addons/common/functions/fnc_getInPosition.sqf
@@ -64,7 +64,7 @@ switch (_position) do {
   };
 
   case "gunner" : {
-    _turret = [typeOf _vehicle] call FUNC(getTurretGunner);
+    _turret = [_vehicle] call FUNC(getTurretGunner);
 
     if (CANGETINTURRETINDEX) then {
       _script = [
@@ -75,7 +75,7 @@ switch (_position) do {
   };
 
   case "commander" : {
-    _turret = [typeOf _vehicle] call FUNC(getTurretCommander);
+    _turret = [_vehicle] call FUNC(getTurretCommander);
 
     if (CANGETINTURRETINDEX) then {
       _script = [
@@ -86,7 +86,7 @@ switch (_position) do {
   };
 
   case "copilot" : {
-    _turret = [typeOf _vehicle] call FUNC(getTurretCopilot);
+    _turret = [_vehicle] call FUNC(getTurretCopilot);
 
     if (CANGETINTURRETINDEX) then {
       _script = [
@@ -100,7 +100,7 @@ switch (_position) do {
 
   case "turret" : {
     private "_turrets";
-    _turrets = [typeOf _vehicle] call FUNC(getTurretsOther);
+    _turrets = [_vehicle] call FUNC(getTurretsOther);
 
     if (_index != -1 && {_turret = _turrets select _index; CANGETINTURRETINDEX}) then {
       _script = [
@@ -127,7 +127,7 @@ switch (_position) do {
 
   case "ffv" : {
     private "_turrets";
-    _turrets = [typeOf _vehicle] call FUNC(getTurretsFFV);
+    _turrets = [_vehicle] call FUNC(getTurretsFFV);
 
     if (_index != -1 && {_turret = _turrets select _index; CANGETINTURRETINDEX}) then {
       _script = [
diff --git a/addons/fcs/functions/fnc_keyDown.sqf b/addons/fcs/functions/fnc_keyDown.sqf
index 7699b82a20..8646ce8468 100644
--- a/addons/fcs/functions/fnc_keyDown.sqf
+++ b/addons/fcs/functions/fnc_keyDown.sqf
@@ -30,7 +30,7 @@ if (_distance == 0) then {
 
 _weaponDirection = _vehicle weaponDirection (_vehicle currentWeaponTurret _turret);  // @todo doesn't work for sub turrets
 
-if (_turret isEqualTo ([typeOf _vehicle] call EFUNC(common,getTurretCommander))) then {
+if (_turret isEqualTo ([_vehicle] call EFUNC(common,getTurretCommander))) then {
     _weaponDirection = eyeDirection _vehicle;
 };
 
diff --git a/addons/fcs/functions/fnc_keyUp.sqf b/addons/fcs/functions/fnc_keyUp.sqf
index 1e5878f0b5..d33bd08893 100644
--- a/addons/fcs/functions/fnc_keyUp.sqf
+++ b/addons/fcs/functions/fnc_keyUp.sqf
@@ -35,7 +35,7 @@ private ["_weaponDirection", "_angleTarget"];
 
 _weaponDirection = _vehicle weaponDirection (_vehicle currentWeaponTurret _turret); // @todo doesn't work for sub turrets
 
-if (_turret isEqualTo ([typeOf _vehicle] call EFUNC(common,getTurretCommander))) then {
+if (_turret isEqualTo ([_vehicle] call EFUNC(common,getTurretCommander))) then {
     _weaponDirection = eyeDirection _vehicle;
 };
 
diff --git a/addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf b/addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf
index 14c86f78dd..6b58fc7bc5 100644
--- a/addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf
+++ b/addons/weaponselect/functions/fnc_fireSmokeLauncher.sqf
@@ -5,7 +5,7 @@ private ["_vehicle", "_turret", "_weapons"];
 
 _vehicle = _this select 0;
 
-_turret = [typeOf _vehicle] call EFUNC(common,getTurretCommander);
+_turret = [_vehicle] call EFUNC(common,getTurretCommander);
 
 _weapons = _vehicle weaponsTurret _turret;