Removed bug with stored locations