Fixed compose bug