fix #85
(cherry picked from commit 2f397df)
apply #85