A fix of #291

Since committer doesn't seem to want to fix it.