Toggle bug fix 2