Small fix
(cherry picked from commit 1337418)