Merge pull request #874 from romainneutron/fix-cs

Fix CS
Add subdef substituer