Fix #1 of Index