Bugfix

Missing conditions on composition loop.