From d90a22afe66a313db907f6acb3a0068b0de7c6bc Mon Sep 17 00:00:00 2001
From: Matthew Honnibal <honnibal+gh@gmail.com>
Date: Tue, 31 Oct 2017 19:58:35 +0100
Subject: [PATCH] Fix loading previous vectors models

---
 spacy/vectors.pyx | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/spacy/vectors.pyx b/spacy/vectors.pyx
index bde793ec5..08ab586d1 100644
--- a/spacy/vectors.pyx
+++ b/spacy/vectors.pyx
@@ -307,9 +307,18 @@ cdef class Vectors:
         path (unicode / Path): Directory path, string or Path-like object.
         RETURNS (Vectors): The modified object.
         """
-        def load_keys(path):
+        def load_key2row(path):
             if path.exists():
                 self.key2row = msgpack.load(path.open('rb'))
+            for key, row in self.key2row.items():
+                if row in self._unset:
+                    self._unset.remove(row)
+
+        def load_keys(path):
+            if path.exists():
+                keys = numpy.load(str(path))
+                for i, key in enumerate(keys):
+                    self.add(key, row=i)
 
         def load_vectors(path):
             xp = Model.ops.xp
@@ -317,7 +326,8 @@ cdef class Vectors:
                 self.data = xp.load(path)
 
         serializers = OrderedDict((
-            ('key2row', load_keys),
+            ('key2row', load_key2row),
+            ('keys', load_keys),
             ('vectors', load_vectors),
         ))
         util.from_disk(path, serializers, exclude)