Conditional expression fix