Fix for #93