Changed order of patching