update #86
(cherry picked from commit f15c765)