SCB:
resolved issue #217, by using hasSimilarTarget instead of target identity check, and in the process also removed a fixme