Patch for #98