Fixed toggling done with UI