diff --git a/persiantools/__init__.py b/persiantools/__init__.py
index 675c5ae..c5da831 100644
--- a/persiantools/__init__.py
+++ b/persiantools/__init__.py
@@ -9,7 +9,7 @@
 
 __title__ = "persiantools"
 __url__ = "https://github.com/mhajiloo/persiantools"
-__version__ = "1.4.1"
+__version__ = "1.6.0"
 __build__ = __version__
 __author__ = "Majid Hajiloo"
 __author_email__ = "majid.hajiloo@gmail.com"
diff --git a/persiantools/jdatetime.py b/persiantools/jdatetime.py
index 92a1283..6d0a06b 100644
--- a/persiantools/jdatetime.py
+++ b/persiantools/jdatetime.py
@@ -435,7 +435,7 @@ def ctime(self):
 
     def strftime(self, fmt, locale=None):
         if locale is None or locale not in ["fa", "en"]:
-            locale = self._locale
+            locale = self.locale
 
         month_names = MONTH_NAMES_EN if locale == "en" else MONTH_NAMES_FA
         month_names_abbr = MONTH_NAMES_ABBR_EN if locale == "en" else MONTH_NAMES_ABBR_FA
@@ -977,7 +977,10 @@ def __repr__(self):
     def __str__(self):
         return self.isoformat(sep=" ")
 
-    def strftime(self, fmt):
+    def strftime(self, fmt, locale=None):
+        if locale is None or locale not in ["fa", "en"]:
+            locale = self.locale
+
         datetime = self.to_gregorian()
 
         format_time = {
@@ -997,7 +1000,7 @@ def strftime(self, fmt):
 
         result = utils.replace(fmt, format_time)
 
-        result = super(JalaliDateTime, self).strftime(result, "en")
+        result = super(JalaliDateTime, self).strftime(result, locale)
 
         return result