Fix bug on compose