Fix for even matches