Use session for saving location Bugfix