Fixed bug with message length < 4