Fix for session value-loss issue.