Applied patch for #353.