Fix bug in timers, found using my new tests. Update to 2.6.1