Over-indexing bugfix (issue #631)

Merged Adam Knapp requested to merge indexing into master

Signed-off-by: Adam Knapp adam.knapp@ericsson.com

Merge request reports