Fix compose