completing previous NPE fix