As done in #36 Follow up of #43
As done in #36
Follow up of #43