Minor improvement in look up.