Fix #65, binary matching problem