Fix for issue with location save