Add fix and test for 1ncw