fixed the timezone problem