Changes for issue #170

Changes for issue #170, missing emoji