fixed rollback issues