Fix cond and add if