Fixed list index glitch