Fix for session hijack issue