Bugfix to lookup interface