Fix bug for NC