Fix a patch to prevent failing tests