[BUGFIX] Adapt to changed array indexes
Merge pull request #650 from bjo3rnf/charliebrowse

[BUGFIX] Adapt to changed array indexes