A small fix on top of Jean-Frederic's df8af31db7
Merge pull request #73 from Karm/master-BZ1080047-vol3

A small fix on top of Jean-Frederic's df8af31db7