fix bugs with not full message