Fix overeager lookup. Fixes #907