make patching sane finally