Added attachment canonical fix