Thanks @JCB. Here is a patch according to @JCB's suggestion in #3