Hotfix time dependency