fixing conditionals