Fixed match logic. For real.