Fixed checking for CNPT.