Fix conditional flag