Fixing the time zone issue