CS fix for IndexLoader