updated #89
(cherry picked from commit 75ed2b9)