Fixed multi-lined message issue by changing codec implementation