Attachements bug fixed