Fix #736 Replaced message to shorter version