fix message issue