flicking rollback fix