Member toggle fix