fix truncated message issue