fix
(cherry-picked from dd36f56)