Fixing timer...