Use ternary expression to avoid initialising with NaN

Use ternary expression to avoid initialising with NaN #4314