updated #87
(cherry picked from commit 79c5d78)