fix #54
(cherry picked from commit 26585e9)
update #54