updated #88
(cherry picked from commit 1378050)