Fix to support MySQL