Fixing timer not being specific enough