fixed missing message stuff