Fix singleton clip formats