diff --git a/Saucy/OutOnALimb/LimbManager.cs b/Saucy/OutOnALimb/LimbManager.cs
index 45a8322..50b8b1f 100644
--- a/Saucy/OutOnALimb/LimbManager.cs
+++ b/Saucy/OutOnALimb/LimbManager.cs
@@ -71,13 +71,16 @@ private void InteractWithClosestLimb()
             EzThrottler.Throttle("InteractPause", 1000, true);
         }
         if (!EzThrottler.Check("InteractPause")) return;
+
+        //2005423	Out on a Limb	0	Out on a Limb machines	0	1	1	0	0
+        var machineNameGS = Svc.Data.GetExcelSheet<EObjName>().GetRow(2005423).Singular.GetText().RemoveSpaces();
+        //30425	Out on a Limb machine	0	Out on a Limb machines	0	1	1	0	0	Experience the heart-exploding excitement of the Gold Saucer in your own home with this authentic Out on a Limb machine.	Out on a Limb Machine	ui/icon/052000/052680.tex	1	1	14	Out on a Limb Machine	Furnishing		EquipSlotCategory#0	125	18740	1	False	True	False	False	2	0	False	False	False	ItemAction#0	2	0	adventurer	ItemRepairResource#0		0	False	False	0	1	0	0		None		0	0, 0, 0, 0	0, 0, 0, 0	adventurer	0	0	0	0	0	0	0	0	0		0		0		0		0		0		0		0		0		0		0		0		0		0	0	0	False	False	0	False
+        var machineNameHousing = Svc.Data.GetExcelSheet<Item>().GetRow(30425).Singular.GetText().RemoveSpaces();
+
         var found = false;
         foreach (var x in Svc.Objects)
         {
-            //2005423	Out on a Limb	0	Out on a Limb machines	0	1	1	0	0
-            //30425	Out on a Limb machine	0	Out on a Limb machines	0	1	1	0	0	Experience the heart-exploding excitement of the Gold Saucer in your own home with this authentic Out on a Limb machine.	Out on a Limb Machine	ui/icon/052000/052680.tex	1	1	14	Out on a Limb Machine	Furnishing		EquipSlotCategory#0	125	18740	1	False	True	False	False	2	0	False	False	False	ItemAction#0	2	0	adventurer	ItemRepairResource#0		0	False	False	0	1	0	0		None		0	0, 0, 0, 0	0, 0, 0, 0	adventurer	0	0	0	0	0	0	0	0	0		0		0		0		0		0		0		0		0		0		0		0		0		0	0	0	False	False	0	False
-
-            if (x.Name.GetText().EqualsIgnoreCaseAny(Svc.Data.GetExcelSheet<EObjName>().GetRow(2005423).Singular.GetText(), Svc.Data.GetExcelSheet<Item>().GetRow(30425).Singular.GetText()) && x.ObjectKind.EqualsAny(ObjectKind.EventObj, ObjectKind.Housing) && Vector3.Distance(Player.Object.Position, x.Position) < 4)
+            if (x.ObjectKind.EqualsAny(ObjectKind.EventObj, ObjectKind.Housing) && x.Name.GetText().RemoveSpaces().EqualsIgnoreCaseAny(machineNameGS, machineNameHousing) && Vector3.Distance(Player.Object.Position, x.Position) < 4)
             {
                 found = true;
                 if (EzThrottler.Throttle("TargetAndInteract"))