fix #53
(cherry picked from commit 3898a57)
update #53