CS fix
(cherry picked from commit b7a58ec)