Actually fixed the Facebook NPEs