Fix timer controller