This fixes bug #8207.  It now starts from 0 when roll-over happens.  I will have to do more later, because I am not sure how to do it better than this, yet.