ShopSystem fix