Hmmm, in fact, maybe I can send a pull-request to your topic-branch and
take care of this...