Timer fix