Fix issue #865
Merge pull request #900 from jgustie/compositehelper

Fix issue #865