Sen2Cor - Metadata file is invalid

Hello.

The following is from the Sen2Cor (v2.2.1) log:

Progress[%]: 34.74 : PID-22576, L2A_Tables: band B08 exported, elapsed time[s]: 40.940
Progress[%]: 34.79 : PID-22576, L2A_Tables: band AOT exported, elapsed time[s]: 6.642
Progress[%]: 35.09 : PID-40120, L2A_Tables: band B04 exported, elapsed time[s]: 40.862
Progress[%]: 35.23 : PID-22576, L2A_Tables: band WVP exported, elapsed time[s]: 18.970
Progress[%]: 35.26 : PID-22576, L2A_Tables: preview image exported, elapsed time[s]: 4.188
Progress[%]: 35.26 : PID-22576, L2A_Tables: stop export, elapsed time[s]: 0.125
Progress[%]: 35.57 : PID-21876, L2A_Tables: band B04 exported, elapsed time[s]: 42.629
Progress[%]: 35.88 : PID-40120, L2A_Tables: band B08 exported, elapsed time[s]: 42.754
Progress[%]: 35.93 : PID-40120, L2A_Tables: band AOT exported, elapsed time[s]: 6.250
Progress[%]: 36.07 : PID-40120, L2A_Tables: band WVP exported, elapsed time[s]: 19.517
Progress[%]: 36.10 : PID-40120, L2A_Tables: preview image exported, elapsed time[s]: 3.751
Progress[%]: 36.10 : PID-40120, L2A_Tables: stop export, elapsed time[s]: 0.140
Progress[%]: 36.43 : PID-21876, L2A_Tables: band B08 exported, elapsed time[s]: 45.347
Progress[%]: 36.48 : PID-21876, L2A_Tables: band AOT exported, elapsed time[s]: 7.001
Progress[%]: 36.64 : PID-21876, L2A_Tables: band WVP exported, elapsed time[s]: 22.408
Progress[%]: 36.67 : PID-21876, L2A_Tables: preview image exported, elapsed time[s]: 3.969
Progress[%]: 36.67 : PID-21876, L2A_Tables: stop export, elapsed time[s]: 0.156
Metadata file is invalid, see report file for details.
Progress[%]: 100.00 : Application terminated successfully.
Finished tool execution in 1728 seconds

From SAFE_report.xml:

<check>
<inspection execution="2016-11-23 17:35:14,167" level="ERROR" process="11068" module="L2A_XmlParser" function="validate" line="126"/>
<message contentType="Text">Schema file: S2-PDGS-TAS-DI-PSD-V13.1_Schema/S2_User_Product_Level-2A_Metadata.xsd</message>
</check>
<check>
<inspection execution="2016-11-23 17:35:14,167" level="ERROR" process="11068" module="L2A_XmlParser" function="validate" line="127"/>
<message contentType="Text">Details: Element 'BAND_NAME': This element is not expected.</message>
</check>

If I look in the L2A product xml there are repeated entries

    <Band_List>
      <BAND_NAME>B1</BAND_NAME>
      <BAND_NAME>B2</BAND_NAME>
      <BAND_NAME>B3</BAND_NAME>
      <BAND_NAME>B4</BAND_NAME>
      <BAND_NAME>B5</BAND_NAME>
      <BAND_NAME>B6</BAND_NAME>
      <BAND_NAME>B7</BAND_NAME>
      <BAND_NAME>B8</BAND_NAME>
      <BAND_NAME>B8</BAND_NAME>
      <BAND_NAME>B8</BAND_NAME>
      <BAND_NAME>B8</BAND_NAME>
      <BAND_NAME>B9</BAND_NAME>
      <BAND_NAME>B10</BAND_NAME>
      <BAND_NAME>B11</BAND_NAME>
      <BAND_NAME>B12</BAND_NAME>
      <BAND_NAME>B8A</BAND_NAME>
    </Band_List>

The repeated B8 entries are the issue. There is a new sen2cor 2.3.0 just released, maybe it helps?

http://step.esa.int/main/third-party-plugins-2/sen2cor/

I am using sen2cor 2.3.0 and still get this same metadata error. Any suggestions on how to fix this? Simply manually removing the repeated entries?