More correct fix for #67