Follow up of issue #43