Replaced timezone manual fix with actual fix.