Bugfix in Index