FIx type + images