Fix timer1 handling so that it doesn't get skipped