Fix conditionals