#3 fix rollback