Fixed long messages bug