Timer regression fix