Fix problem with truncated message