Fixing time zone issue