Fix attachment probem