Hopefully fix the NPEs