Suggested fix for issue #21.

Merged Jani Lainema requested to merge lainema/ECM:fix21 into master

Merge request reports