Fix comparison bug caused by flip
Merge branch 'FlipComparison'

* FlipComparison:
  Fix comparison bug caused by flip