Composing bugfix