Fix Attribute matching spanning more than one attribute.