Quick toggle fix