fix message builder