Added a fix for long messages