patch for #472