Fix #536 more message problem