fixes to !choice