Fixing bug in compose