Bugfix: Index issues.