modification for mysql 5.6