More IndexError fix.