timer-fixes-2