Fixed bug switching between locations