One last bug for comparison
Merge branch 'FlipComparison'

* FlipComparison:
  One last bug for comparison