Fix side-effects of PR #237 - see #242
Merge branch 'fabien-fix/issue-242'