fix rollback bug