More attempts to fix the time issues.