diff --git a/web/documentserver-example/python/src/utils/historyManager.py b/web/documentserver-example/python/src/utils/historyManager.py
index 1f9053e1..1d23cd73 100644
--- a/web/documentserver-example/python/src/utils/historyManager.py
+++ b/web/documentserver-example/python/src/utils/historyManager.py
@@ -43,7 +43,7 @@ def getFileVersion(histDir):
     if not os.path.exists(histDir):
         return 0
 
-    cnt = 0
+    cnt = 1
 
     for f in os.listdir(histDir):
         if not os.path.isfile(os.path.join(histDir, f)):
@@ -53,7 +53,7 @@ def getFileVersion(histDir):
 
 def getNextVersionDir(histDir):
     v = getFileVersion(histDir)
-    path = getVersionDir(histDir, v + 1)
+    path = getVersionDir(histDir, v)
 
     if not os.path.exists(path):
         os.makedirs(path)
@@ -84,7 +84,7 @@ def createMeta(storagePath, req):
     user = users.getUserFromReq(req)
 
     obj = {
-        'created': datetime.today().strftime('%d.%m.%Y %H:%M:%S'),
+        'created': datetime.today().strftime('%Y-%m-%d %H:%M:%S'),
         'uid': user['uid'],
         'uname': user['uname']
     }
@@ -128,12 +128,12 @@ def getHistoryObject(storagePath, filename, docKey, docUrl, req):
     if version > 0:
         hist = []
         histData = {}
-
-        for i in range(version + 1):
+        
+        for i in range(1, version + 1):
             obj = {}
             dataObj = {}
-            prevVerDir = getVersionDir(histDir, i)
-            verDir = getVersionDir(histDir, i + 1)
+            prevVerDir = getVersionDir(histDir, i - 1)
+            verDir = getVersionDir(histDir, i)
 
             try:
                 key = docKey if i == version else readFile(getKeyPath(verDir))
@@ -143,7 +143,7 @@ def getHistoryObject(storagePath, filename, docKey, docUrl, req):
                 dataObj['key'] = key
                 dataObj['version'] = i
 
-                if i == 0:
+                if i == 1:
                     meta = getMeta(storagePath)
                     if meta:
                         obj['created'] = meta['created']
@@ -152,9 +152,9 @@ def getHistoryObject(storagePath, filename, docKey, docUrl, req):
                             'name': meta['uname']
                         }
                     
-                dataObj['url'] = docUrl if i == version else getPrevUri(filename, i + 1, fileUtils.getFileExt(filename), req)
+                dataObj['url'] = docUrl if i == version else getPrevUri(filename, i, fileUtils.getFileExt(filename), req)
 
-                if i > 0:
+                if i > 1:
                     changes = json.loads(readFile(getChangesHistoryPath(prevVerDir)))
                     change = changes['changes'][0]
                     
@@ -163,16 +163,16 @@ def getHistoryObject(storagePath, filename, docKey, docUrl, req):
                     obj['created'] = change['created']
                     obj['user'] = change['user']
 
-                    prev = histData[str(i - 1)]
+                    prev = histData[str(i - 2)]
                     prevInfo = {
                         'key': prev['key'],
                         'url': prev['url']
                     }
                     dataObj['previous'] = prevInfo
-                    dataObj['changesUrl'] = getZipUri(filename, i, req)
+                    dataObj['changesUrl'] = getZipUri(filename, i - 1, req)
 
                 hist.append(obj)
-                histData[str(i)] = dataObj
+                histData[str(i - 1)] = dataObj
             except Exception:
                 return {}
         
diff --git a/web/documentserver-example/python/templates/editor.html b/web/documentserver-example/python/templates/editor.html
index dcc86a5b..6212ee56 100644
--- a/web/documentserver-example/python/templates/editor.html
+++ b/web/documentserver-example/python/templates/editor.html
@@ -121,7 +121,7 @@
                 config.events['onRequestHistoryData'] = function (event) {
                     var ver = event.data;
                     var histData = {{ historyData | safe }};
-                    docEditor.setHistoryData(histData[ver]);
+                    docEditor.setHistoryData(histData[ver - 1]);
                 };
                 config.events['onRequestHistoryClose'] = function () {
                     document.location.reload();