fixed bug with locations