Check for NaN, remove a place where it was being triggered