Made contextual lookup work again.