Fixed match problem