Test and fix for #93