Patch for #238