diff --git a/jet/dashboard/models.py b/jet/dashboard/models.py
index cf43c30c..ded178e9 100644
--- a/jet/dashboard/models.py
+++ b/jet/dashboard/models.py
@@ -1,7 +1,8 @@
 from importlib import import_module
 import json
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
+from six import python_2_unicode_compatible
+
 from django.utils.translation import ugettext_lazy as _
 from jet.utils import LazyDateTimeEncoder
 
diff --git a/jet/models.py b/jet/models.py
index 8fe97564..c7df5e7e 100644
--- a/jet/models.py
+++ b/jet/models.py
@@ -1,8 +1,8 @@
 from django.db import models
 from django.utils import timezone
-from django.utils.encoding import python_2_unicode_compatible
-from django.utils.translation import ugettext_lazy as _
+from six import python_2_unicode_compatible
 
+from django.utils.translation import ugettext_lazy as _
 
 @python_2_unicode_compatible
 class Bookmark(models.Model):
diff --git a/package.json b/package.json
index bc2d748e..ed9801ef 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "select2": "4.0.0",
     "timepicker": "git://github.com/geex-arts/timepicker",
     "vinyl-buffer": "1.0.0",
-    "vinyl-source-stream": "1.1.0"
+    "vinyl-source-stream": "1.1.0",
+    "six":"1.16.0"
   }
 }