diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf
index ee90af64ad..9ea907d8cd 100644
--- a/addons/interaction/XEH_postInit.sqf
+++ b/addons/interaction/XEH_postInit.sqf
@@ -29,8 +29,8 @@ GVAR(isOpeningDoor) = false;
 
     if (_unit == ACE_player) then {
         addCamShake [4, 0.5, 5];
-        private _message = parseText format ([["%1 >", localize LSTRING(YouWereTappedRight)], ["< %1", localize LSTRING(YouWereTappedLeft)]] select (_shoulderNum == 0));
-        [_message] call FUNC(displayTextStructured);
+        private _message = parseText format ([["%1 >", localize LSTRING(YouWereTappedRight)], ["< %1", localize LSTRING(YouWereTappedLeft)]] select (_shoulderNum == 1));
+        [_message] call EFUNC(common,displayTextStructured);
     };
 }] call EFUNC(common,addEventHandler);
 
@@ -67,8 +67,11 @@ private "_team";
     // Conditions: specific
     if !([ACE_player, cursorTarget] call FUNC(canTapShoulder)) exitWith {false};
 
+    //Tap whichever shoulder is closest
+    private _shoulderNum = [0, 1] select (([cursorTarget, ACE_player] call BIS_fnc_relativeDirTo) > 180);
+    
     // Statement
-    [ACE_player, cursorTarget, 0] call FUNC(tapShoulder);
+    [ACE_player, cursorTarget, _shoulderNum] call FUNC(tapShoulder);
     true
 },
 {false},
diff --git a/addons/laser/CfgVehicles.hpp b/addons/laser/CfgVehicles.hpp
index dd3f02a0cc..d8976ac204 100644
--- a/addons/laser/CfgVehicles.hpp
+++ b/addons/laser/CfgVehicles.hpp
@@ -5,7 +5,7 @@ class CfgVehicles {
         // @TODO: Changing the model and simulation hides it, but THEN IT DOESNT SPAWN WTF!?
         model = "\A3\Weapons_F\empty.p3d";
         destrType = "DestructNo";
-        simulation = "house";
+        simulation = "LaserTarget";
         
         class EventHandlers {
             init = QUOTE(_this call FUNC(laser_init));