Another potentil fix for the timezone issue