Fix usage of ? in conditions