Bugdix 1 to toggle :P