Fixed broken conditionals