am 396b83b0: Merge "Fix overflow/underflow problem in comparison"

* commit '396b83b0c8a9c615ca416fa7a7d366a4e30971a1':
  Fix overflow/underflow problem in comparison