Changed logical operator to plain conditional statement.