Fixer: make patching more robust