Patch for #87