Replying to myself with a patch...