[FIX] Index fix