Issue #62. Thanks to doridori.