Fixed logic with DoIsomorphMatch