FIXUP - also match signal member