Compose fix