Improve for #64 and #67