fixed issues with location