fix #81
(cherry picked from commit 064153f)
update #81