Fix the NPEs