Cumulative fix for the complicated composition scenario