Corrected conditional flow