Patch for #255