Fix to null-prototyped objects