Fix issue with looong messages