Fix issue with lookup