fixed #89
(cherry picked from commit 9f8e65f)
updated #89