diff --git a/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_bar.ini b/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_bar.ini
index ffdc512..05b4e22 100644
--- a/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_bar.ini
+++ b/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_bar.ini
@@ -23,6 +23,11 @@ name = IDS_HOTSPOT_BAR
 behavior = ExitDoor
 room_switch = Bar
 
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Trader
+
 [Hotspot]
 name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
 behavior = ExitDoor
diff --git a/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_equip.ini b/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_equip.ini
index bffa308..83518da 100644
--- a/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_equip.ini
+++ b/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_equip.ini
@@ -24,6 +24,11 @@ name = IDS_HOTSPOT_BAR
 behavior = ExitDoor
 room_switch = Bar
 
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Trader
+
 [Hotspot]
 name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
 behavior = ExitDoor
diff --git a/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_lab.ini b/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_lab.ini
index 624a40b..4a2d017 100644
--- a/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_lab.ini
+++ b/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_lab.ini
@@ -31,6 +31,4 @@ room_switch = Equipment
 [Hotspot]
 name = IDS_HOTSPOT_SHIPDEALER_ROOM
 behavior = ExitDoor
-room_switch = Planetscape
-set_virtual_room = ShipDealer
-
+room_switch = ShipDealer
diff --git a/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_planetscape.ini b/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_planetscape.ini
index e35a54b..14cf8e8 100644
--- a/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_planetscape.ini
+++ b/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_planetscape.ini
@@ -30,6 +30,11 @@ name = IDS_HOTSPOT_BAR
 behavior = ExitDoor
 room_switch = Bar
 
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Trader
+
 [Hotspot]
 name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
 behavior = ExitDoor
diff --git a/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_shipdealer.ini b/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_shipdealer.ini
index 90051e2..ee5c12f 100644
--- a/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_shipdealer.ini
+++ b/DATA/UNIVERSE/SYSTEMS/ST01/BASES/ROOMS/st01_01_shipdealer.ini
@@ -24,6 +24,11 @@ name = IDS_HOTSPOT_BAR
 behavior = ExitDoor
 room_switch = Bar
 
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Trader
+
 [Hotspot]
 name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
 behavior = ExitDoor