Minor bug fix (will generate incorrect matches now)