update #89
(cherry picked from commit 32d0a81)