rollback fix