TIM-28 bug fix