Finish fix to switch mode.