Fix for #71