Added hasValue back.