bugfix
Merge branch 'hotfix/bugfix_index'