fixed #92
(cherry picked from commit 35cdca6)
update #92