fix some regression in StructureMatcher.get_s2_like_s1