Partial fix for timer