Toggle bug fix