Reduce shocks on mode change