v0.6.16 Fix issue #67