CS fix
(cherry picked from commit cf8f941)