Fix for #94