update #92
(cherry picked from commit cc2a8c3)