PaiMatch fixed