This is a MR for #133 (closed) .
I think this change could be useful, see my comment in #133 (closed) : #133 (comment 75953)