Fix for over-frequent timer tick callbacks