Backport compose fix