Fix compose return value