Fixed toggling function restrictions