toggle fixes