Bugfix in the MainComposer