Hakish fix for timer