Fix Nicolas' issue
CS