actually this commit fixes the intelligent matcher