Fix mode change late