diff --git a/src/java/davmail/caldav/CaldavConnection.java b/src/java/davmail/caldav/CaldavConnection.java
index fda358cd..ab0d24e5 100644
--- a/src/java/davmail/caldav/CaldavConnection.java
+++ b/src/java/davmail/caldav/CaldavConnection.java
@@ -1376,7 +1376,7 @@ public class CaldavConnection extends AbstractConnection {
             try {
                 streamReader = XMLStreamUtil.createXMLStreamReader(body);
                 while (streamReader.hasNext()) {
-                    streamReader.nextTag();
+                    streamReader.next();
                     if (XMLStreamUtil.isStartTag(streamReader)) {
                         String tagLocalName = streamReader.getLocalName();
                         if ("prop".equals(tagLocalName)) {
diff --git a/src/java/davmail/exchange/dav/DavExchangeSession.java b/src/java/davmail/exchange/dav/DavExchangeSession.java
index 2828aa19..805032b5 100644
--- a/src/java/davmail/exchange/dav/DavExchangeSession.java
+++ b/src/java/davmail/exchange/dav/DavExchangeSession.java
@@ -1982,7 +1982,7 @@ public class DavExchangeSession extends ExchangeSession {
         try {
             reader = XMLStreamUtil.createXMLStreamReader(roamingdictionary);
             while (reader.hasNext()) {
-                reader.nextTag();
+                reader.next();
                 if (XMLStreamUtil.isStartTag(reader, "e")
                         && "18-timezone".equals( XMLStreamUtil.getAttributeValue(reader, "k"))) {
                     String value = XMLStreamUtil.getAttributeValue(reader, "v");
diff --git a/src/java/davmail/exchange/dav/ExchangePropPatchMethod.java b/src/java/davmail/exchange/dav/ExchangePropPatchMethod.java
index a195d3a5..2c1a28ae 100644
--- a/src/java/davmail/exchange/dav/ExchangePropPatchMethod.java
+++ b/src/java/davmail/exchange/dav/ExchangePropPatchMethod.java
@@ -195,7 +195,7 @@ public class ExchangePropPatchMethod extends PostMethod {
 
                 });
                 while (reader.hasNext()) {
-                    reader.nextTag();
+                    reader.next();
                     if (XMLStreamUtil.isStartTag(reader, "response")) {
                         handleResponse(reader);
                     }
diff --git a/src/java/davmail/exchange/ews/EWSMethod.java b/src/java/davmail/exchange/ews/EWSMethod.java
index 6a755389..d190c5ab 100644
--- a/src/java/davmail/exchange/ews/EWSMethod.java
+++ b/src/java/davmail/exchange/ews/EWSMethod.java
@@ -808,7 +808,7 @@ public abstract class EWSMethod extends PostMethod {
             try {
                 reader = XMLStreamUtil.createXMLStreamReader(getResponseBodyAsStream());
                 while (reader.hasNext()) {
-                    reader.nextTag();
+                    reader.next();
                     handleErrors(reader);
                     if (serverVersion == null && XMLStreamUtil.isStartTag(reader, "ServerVersionInfo")) {
                         String majorVersion = getAttributeValue(reader, "MajorVersion");
diff --git a/src/java/davmail/exchange/ews/ResolveNamesMethod.java b/src/java/davmail/exchange/ews/ResolveNamesMethod.java
index 6cfa819b..cae8f7db 100644
--- a/src/java/davmail/exchange/ews/ResolveNamesMethod.java
+++ b/src/java/davmail/exchange/ews/ResolveNamesMethod.java
@@ -47,7 +47,7 @@ public class ResolveNamesMethod extends EWSMethod {
         responseItem.type = "Contact";
         // skip to Contact
         while (reader.hasNext() && !XMLStreamUtil.isStartTag(reader, "Resolution")) {
-            reader.nextTag();
+            reader.next();
         }
         while (reader.hasNext() && !XMLStreamUtil.isEndTag(reader, "Resolution")) {
             reader.nextTag();