Fix root choice targeting