Fix attribute matching