Fixed to use default composer