Fixed NC bug