Fix Issue#2 (like overmatching)