Adding a fix for time zone issues.