Timer's fixed (again)