Delete shop_handle called, fix bug