Timer fixed again