Fixed bug where composition isn't established correctly.