context finding fix