diff --git a/entsoe/entsoe.py b/entsoe/entsoe.py
index 0856869..9dff40d 100644
--- a/entsoe/entsoe.py
+++ b/entsoe/entsoe.py
@@ -24,7 +24,7 @@
 warnings.filterwarnings('ignore', category=XMLParsedAsHTMLWarning)
 
 __title__ = "entsoe-py"
-__version__ = "0.6.15"
+__version__ = "0.6.16"
 __author__ = "EnergieID.be, Frank Boerman"
 __license__ = "MIT"
 
diff --git a/entsoe/parsers.py b/entsoe/parsers.py
index da18dc1..83debe5 100644
--- a/entsoe/parsers.py
+++ b/entsoe/parsers.py
@@ -253,12 +253,8 @@ def parse_crossborder_flows(xml_text):
     -------
     pd.Series
     """
-    series = []
-    for soup in _extract_timeseries(xml_text):
-        series.append(_parse_crossborder_flows_timeseries(soup))
-    series = pd.concat(series)
-    series = series.sort_index()
-    return series
+    return _parse_timeseries_generic_whole(xml_text, to_float=True)
+
     
 def parse_activated_balancing_energy_prices(xml_text):
     """