Additional IndexError fix.