Merge change 760 into donut

* changes:
  don't use modulo