Fix flow detection in conditions