fix switching