CS fix (related to #2090).