Fix to problems of NON
Fix to NFN problems