Patch for #297