Must fix timer on restart