Fix messages overflow