Fix choice rendering