CS fix for pre-release