Bye undefined indexes!

Resolved the last known issue.