Trying fixing that lookup...