attempt to fix message echo bug