diff --git a/CMakeLists.txt b/CMakeLists.txt
index c81727820..4429cc599 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_C_STANDARD 23 CACHE STRING "The C standard to use")
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 
-project(Ship VERSION 9.2.2 LANGUAGES C CXX)
+project(Ship VERSION 9.2.3 LANGUAGES C CXX)
 include(CMake/soh-cvars.cmake)
 include(CMake/lus-cvars.cmake)
 set(SPDLOG_LEVEL_TRACE 0)
diff --git a/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp b/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp
index 56fa5c7b1..9a004f4ab 100644
--- a/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp
+++ b/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp
@@ -24,8 +24,8 @@ extern PlayState* gPlayState;
      RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL))
 
 void BuildMerchantMessage(CustomMessage& msg, RandomizerCheck rc, bool mysterious = true) {
-    RandomizerGet rgid = RAND_GET_ITEM(rc)->GetPlacedRandomizerGet();
-    uint16_t price = RAND_GET_ITEM(rc)->GetPrice();
+    auto location = RAND_GET_ITEM(rc);
+    RandomizerGet rgid = location->GetPlacedRandomizerGet();
     CustomMessage itemName;
     std::string color = Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetColor();
     if (mysterious) {
@@ -37,10 +37,14 @@ void BuildMerchantMessage(CustomMessage& msg, RandomizerCheck rc, bool mysteriou
         color = "%g";
     } else {
         const Rando::Item& item = Rando::StaticData::RetrieveItem(rgid);
-        itemName = item.GetHint().GetHintMessage().GetForCurrentLanguage();
+        if (Rando::StaticData::GetLocation(rc)->IsShop()) {
+            itemName = CustomMessage(Rando::StaticData::RetrieveItem(rgid).GetName());
+        } else {
+            itemName = item.GetHint().GetHintMessage();
+        }
     }
     msg.Replace("[[color]]", color);
-    msg.InsertNames({ itemName, CustomMessage(std::to_string(price)) });
+    msg.InsertNames({ itemName, CustomMessage(std::to_string(location->GetPrice())) });
 }
 
 void BuildBeanGuyMessage(uint16_t* textId, bool* loadFromMessageTable) {
diff --git a/soh/soh/Enhancements/randomizer/location.cpp b/soh/soh/Enhancements/randomizer/location.cpp
index 15f35f11b..9f4365e0e 100644
--- a/soh/soh/Enhancements/randomizer/location.cpp
+++ b/soh/soh/Enhancements/randomizer/location.cpp
@@ -1,6 +1,5 @@
 #include "location.h"
 #include "static_data.h"
-#include <algorithm>
 #include <assert.h>
 #include "option.h"