Bug: Fixed if the message is smaller than it should be we get a panic :(