Fixed ambiguous conditional expression