Additional fix for time issue.