Fixed Session Timeout bug