Fixed rollback-flag mismatch