hotfix for index error
Merge branch 'indfix' into develop