Patch me if you can