Bring in mje's fix for #14
v1.73_01