Fix conditional statements