Patch for #13