bug fix
(cherry picked from commit 39ab2f4)
000