Quick fix for indexing