Fixed message building.