Fixes problem with location