Bring in mje's fix for #14