Bug fix for current match