Fix rollback issue