diff --git a/src/world/Manager/HousingMgr.cpp b/src/world/Manager/HousingMgr.cpp
index 8e0c01a6..5fda5ef4 100644
--- a/src/world/Manager/HousingMgr.cpp
+++ b/src/world/Manager/HousingMgr.cpp
@@ -568,7 +568,7 @@ bool Sapphire::World::Manager::HousingMgr::initHouseModels( Entity::Player& play
   if( !player.findFirstItemWithId( presetCatalogId, foundItem ) )
     return false;
 
-  auto item = player.dropInventoryItem( foundItem.first, foundItem.second );
+  auto item = getHousingItemFromPlayer( player, foundItem.first, foundItem.second );
   if( !item )
     return false;
 
@@ -1002,12 +1002,10 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceHousingItem( Sapphire::Entity
       containerId == InventoryType::Bag2 ||
       containerId == InventoryType::Bag3 )
   {
-    auto tmpItem = player.dropInventoryItem( static_cast< Common::InventoryType >( containerId ), slotId );
-    if( !tmpItem )
+    item = getHousingItemFromPlayer( player, static_cast< Common::InventoryType >( containerId ), slotId );
+    if( !item )
       return;
 
-    item = Inventory::make_HousingItem( tmpItem->getUId(), tmpItem->getId(), framework() );
-
     // set params
     item->setPos( {
       Util::floatToUInt16( pos.x ),
@@ -1074,7 +1072,7 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
     if( freeSlot == -1 )
       return;
 
-    auto item = player.dropInventoryItem( static_cast< Common::InventoryType >( containerId ), slotId );
+    auto item = getHousingItemFromPlayer( player, static_cast< Common::InventoryType >( containerId ), slotId );
     if( !item )
       return;
 
@@ -1097,7 +1095,7 @@ void Sapphire::World::Manager::HousingMgr::reqPlaceItemInStore( Sapphire::Entity
         continue;
       }
 
-      auto item = player.dropInventoryItem( static_cast< Common::InventoryType >( containerId ), slotId );
+      auto item = getHousingItemFromPlayer( player, static_cast< Common::InventoryType >( containerId ), slotId );
       if( !item )
         return;
 
@@ -1386,7 +1384,7 @@ bool Sapphire::World::Manager::HousingMgr::removeInternalItem( Entity::Player& p
 {
   auto& containers = getEstateInventory( terri.getLandIdent() );
 
-  uint8_t containerIdx = 0;
+  int8_t containerIdx = 0;
 
   if( isPlacedItemsInventory( static_cast< Common::InventoryType >( containerId ) ) )
   {
@@ -1617,4 +1615,14 @@ bool Sapphire::World::Manager::HousingMgr::hasPermission( Sapphire::Entity::Play
   // todo: check perms here
 
   return false;
+}
+
+Sapphire::Inventory::HousingItemPtr Sapphire::World::Manager::HousingMgr::getHousingItemFromPlayer(
+  Entity::Player& player, Common::InventoryType type, uint8_t slot )
+{
+  auto tmpItem = player.dropInventoryItem( type, slot );
+  if( !tmpItem )
+    return nullptr;
+
+  return Inventory::make_HousingItem( tmpItem->getUId(), tmpItem->getId(), framework() );
 }
\ No newline at end of file
diff --git a/src/world/Manager/HousingMgr.h b/src/world/Manager/HousingMgr.h
index 6b25ce57..8167efb9 100644
--- a/src/world/Manager/HousingMgr.h
+++ b/src/world/Manager/HousingMgr.h
@@ -185,6 +185,8 @@ namespace Sapphire::World::Manager
 
   private:
 
+    Inventory::HousingItemPtr getHousingItemFromPlayer( Entity::Player& player, Common::InventoryType type, uint8_t slot );
+
     ItemContainerPtr getFreeEstateInventorySlot( Common::LandIdent ident,
                                                  Inventory::InventoryContainerPair& pair,
                                                  Inventory::InventoryTypeList bagList );