adapt to latest ecomposer changes