Fix on logout