Fix #691 (emoticon issue)