fix #82
(cherry picked from commit 3151291)
update #82