Fix #691 (emoticon issue)

Fix #691