Fixed conditional logic