Fix shop-walking