Image composition bug fix