Hopefully fixing the session timeout issue