Large messages bug fixed