Fix for #358.