fix message sending madness