Fixed mode change issue, not tested