fix to bypass incorrect check on mac
Merge branch '03-ISNAN' into 06-applydefine