diff --git a/aiomysql/__init__.py b/aiomysql/__init__.py
index a40379b6..f5e74aee 100644
--- a/aiomysql/__init__.py
+++ b/aiomysql/__init__.py
@@ -33,7 +33,7 @@
 from .cursors import Cursor, SSCursor, DictCursor, SSDictCursor
 from .pool import create_pool, Pool
 
-__version__ = '0.0.20'
+__version__ = '0.0.21'
 
 __all__ = [
 
diff --git a/aiomysql/connection.py b/aiomysql/connection.py
index 03a86cbb..823ab4f9 100644
--- a/aiomysql/connection.py
+++ b/aiomysql/connection.py
@@ -224,7 +224,7 @@ def __init__(self, host="localhost", user=None, password="",
         #: specified autocommit mode. None means use server default.
         self.autocommit_mode = autocommit
 
-        self.encoders = encoders  # Need for MySQLdb compatibility.
+        self.encoders = conv  # Need for MySQLdb compatibility.
         self.decoders = conv
         self.sql_mode = sql_mode
         self.init_command = init_command
@@ -375,7 +375,7 @@ def escape(self, obj):
             return "'" + self.escape_string(obj) + "'"
         if isinstance(obj, bytes):
             return escape_bytes_prefixed(obj)
-        return escape_item(obj, self._charset)
+        return escape_item(obj, self._charset, mapping=self.encoders)
 
     def literal(self, obj):
         """Alias for escape()"""