NEP issue after fix of ZK-1845