Fix for message length in COM_QUERY