update for changes in NaN handling in jmacro