Fixed rollback