Fix endless loop with shops