Add fix to LogoutHandler