Fix for #105