Avoid jump at the end of the count

This fixes #18