Fix MasterComposer