Fixed issue when shop, Jason pls fix