Fix conditional formatting