Fix #46 - Incorrect current match highlighting

Problem identified and patch submitted by @nkouevda