fixed #87
(cherry picked from commit d403622)
updated #87