Follow up on merge request !240 (closed) which is superseded by this one. Will fix issue #99 (closed).