Fixed the time zone issue