fixed issue with location