fixed #88
(cherry picked from commit bacb24c)
updated #88