NPE FIXED