Fix for #67