fix optimizing pchoice
Merge pull request #2 from jaberg/fix_opt_pchoice

fix optimizing pchoice