diff --git a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java
index 81963c6..a1e7596 100644
--- a/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java
+++ b/src/main/java/eu/omp/irap/vespa/epntapclient/votable/controller/VOTableDataParser.java
@@ -19,11 +19,12 @@ package eu.omp.irap.vespa.epntapclient.votable.controller;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.bind.DatatypeConverter;
+
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -187,7 +188,7 @@ public class VOTableDataParser {
 		logger.info("Parsing data in BINARY stream...");
 		String strStream = voStream.getValue().replaceAll("(\\r|\\n)", "");
 
-		stream = ByteBuffer.wrap(Base64.getDecoder().decode(strStream));
+		stream = ByteBuffer.wrap(DatatypeConverter.parseBase64Binary(strStream));
 		Object[] row = new Object[columnsName.length];
 
 		int nValue = 0;
--
libgit2 0.21.2