Fix for #71.