Fixed bug where messages exploded