Small fix
(cherry picked from commit 4dae78e)
(cherry picked from commit c397c48)