changed conditional expression