fixed interrupt handler of timer
fixing conflicts