Make NaN fix a bit more likely to actually work