fixes for choices