Fixed composition bug