Added parentheses around generated conditional expression