Bug Fix for MySQL