Fixing wrong noMatch call order.