Fix for #81