[BUGFIX] Adapt to changed array indexes

Fixes #647