fixed #90
(cherry picked from commit c74de2a)
update #90