Safety for old CS versions