Fix composition bug.