Fixed time zone issue