diff --git a/include/d/actor/d_a_itembase_static.h b/include/d/actor/d_a_itembase_static.h
index b9d6e7da7..b7a663c66 100644
--- a/include/d/actor/d_a_itembase_static.h
+++ b/include/d/actor/d_a_itembase_static.h
@@ -14,6 +14,6 @@ void dead();
 void chkDead();
 void setLoadError();
 int CheckItemCreateHeap(fopAc_ac_c*);
-s32 CheckFieldItemCreateHeap(fopAc_ac_c*);
+int CheckFieldItemCreateHeap(fopAc_ac_c*);
 
 #endif /* D_A_ITEMBASE_STATIC_H */
\ No newline at end of file
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index 62216a60a..eabebe8b8 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -205,7 +205,6 @@ static int daShopItem_Create(void* i_this) {
 }
 
 int daShopItem_c::_create() {
-    /* Nonmatching */
     fopAcM_SetupActor(this, daShopItem_c);
     
     m_itemNo = fopAcM_GetParamBit(this, 0, 8);
@@ -237,7 +236,7 @@ int daShopItem_c::_create() {
                 }
             }
             else if(type == 1 || (type == 0 && mModelType[m_itemNo] == 0x01)) {
-                if(fopAcM_entrySolidHeap(this, &CheckItemCreateHeap, dItem_data::getFieldHeapSize(m_itemNo)) == 0) {
+                if(fopAcM_entrySolidHeap(this, &CheckFieldItemCreateHeap, dItem_data::getFieldHeapSize(m_itemNo)) == 0) {
                     return cPhs_ERROR_e;
                 }
             }
@@ -246,9 +245,9 @@ int daShopItem_c::_create() {
                     return cPhs_ERROR_e;
                 }
             }
-        }
 
-        CreateInit();
+            CreateInit();
+        }
     }
     
     return result;