more message fixing