Fix for #85