NUTCH-1640 had not been done properly