fix issue with partial matches