Fix for #402.