message generation fix