Fix only_if conditionals