IDEA-80056 fixed lookup