Fixed bug with entering locations