fix #80
(cherry picked from commit cb13347)
#80 issue update