Possible fix for #71.