Fixed listen for toggle methods