fix expression based conditions