Patch for #28