final bug fix Similarity

This reverts commit b030841e8cb604accdf8608e1c3c22584cb98dff.
Similarity final commit
Merge remote-tracking branch 'origin/simple-similarity' into simple-similarity