Index type fix