Small fix
(cherry picked from commit 9f67904)
(cherry picked from commit 6968a22)