diff --git a/ChangeLog b/ChangeLog
index 85c66e455..edfd798cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Turkish update, thanks to Burak Yavuz
 - patch #2496403 [display] Multi-row change with "]",
   thanks to Virsacer - virsacer
+- bug #2027720 [parser] Missing space after BINARY used as cast 
 
 3.1.2.0 (not yet released)
 - bug #1253252 [display] Can't NULL a column with relation defined 
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index ba9c955d7..dbd5dc1e5 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -695,11 +695,11 @@ if (! defined('PMA_MINIMUM_COMMON')) {
                     $t_suffix = '_columnType';
 
                     /**
-                     * Temporary fix for BUG #621357
+                     * Temporary fix for BUG #621357 and #2027720
                      *
                      * @todo FIX PROPERLY NEEDS OVERHAUL OF SQL TOKENIZER
                      */
-                    if ($d_cur_upper == 'SET' && $t_next != 'punct_bracket_open_round') {
+                    if (($d_cur_upper == 'SET' || $d_cur_upper == 'BINARY') && $t_next != 'punct_bracket_open_round') {
                         $t_suffix = '_reservedWord';
                     }
                     //END OF TEMPORARY FIX