Improve the Disable NaN kick