fix #86
(cherry picked from commit 7b92b9c)
update #86