Change mode bug fix