update #68
(cherry picked from commit ae0955a)