Our patched version