Change locations, fixed possible bug