COrrected CNI.cpp case