fix double order match