Add a fix for function based index that were not catched