Another approach to fix NLJ/IndexScan problem