fix cond and comprehension adding