fix push and switch commands