Patch for #266