• fix partial matching problems