Fixed timer problem