Patch for #291