Another fix for mysql 5.6