#67 fixed mode changing