Fix the patch some more..