fix for run with/o indexer