Fix for session timeout