Maybe fixed NPEs this time?