Making a patch while I’m being chased