Fix for CS