fixed rollback issue