Match on attachment too