diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3712dfa..44420fd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ Each section shall contain a list of action items of the following format: `<bri
 
 - Corrected three erroneous context-free codes in Table 3:8.3.2.10.2-1 ([#505](https://github.com/IHE/DEV.SDPi/issues/505))
 - Clarified referenced standards sections in 2:A and removed ISO prefix from IEEE/ISO standards for referential consistency ([#390](https://github.com/IHE/DEV.SDPi/issues/390))
+- Fixed TimeStampVersion.xsd to resolve double nesting of sdpi:Epoch element ([#520](https://github.com/IHE/DEV.SDPi/issues/520)). 
 - Correction of regular expression for xsd:duration restriction ([#516](https://github.com/IHE/DEV.SDPi/issues/516))
 
 ### Editorial Fixes
diff --git a/sources/extension-models/timestamp/TimeStampVersion.xsd b/sources/extension-models/timestamp/TimeStampVersion.xsd
index f96b410e..b9f32c66 100644
--- a/sources/extension-models/timestamp/TimeStampVersion.xsd
+++ b/sources/extension-models/timestamp/TimeStampVersion.xsd
@@ -48,7 +48,7 @@
   <!---->
   <!---->
   <!--Epochs-->
-  <xsd:element name="Epochs">
+  <xsd:element name="Epochs" type="sdpi:EpochsType">
     <xsd:annotation>
       <xsd:documentation>
         An extension to version epochs arising from non-slewing time adjustments.
@@ -56,16 +56,6 @@
         This extension can be attached to the pm:ClockState/ext:Extension element.
       </xsd:documentation>
     </xsd:annotation>
-    <xsd:complexType>
-      <xsd:sequence>
-        <xsd:element name="Epoch" type="sdpi:EpochsType" minOccurs="0" maxOccurs="unbounded" /> 
-      </xsd:sequence>
-      <xsd:attribute name="Version" type="sdpi:EpochVersion" use="required">
-        <xsd:annotation>
-          <xsd:documentation>Current epoch version. Implied value is 0.</xsd:documentation>
-        </xsd:annotation>
-      </xsd:attribute>
-    </xsd:complexType>
   </xsd:element>
   <xsd:complexType name="EpochsType">
     <xsd:annotation>
@@ -77,6 +67,14 @@
                    minOccurs="0"
                    maxOccurs="unbounded" />
     </xsd:sequence>
+    <xsd:attribute name="Version"
+                   default="0"
+                   type="sdpi:EpochVersion"
+                   use="optional">
+      <xsd:annotation>
+        <xsd:documentation>Current epoch version. Implied value is 0.</xsd:documentation>
+      </xsd:annotation>
+    </xsd:attribute>
   </xsd:complexType>
   <xsd:complexType name="EpochType">
     <xsd:annotation>