fix multiple messaging