Lookup fix

https://projects.pbs.org/jira/browse/LUN-1711