Fixed bug with locations