revert simple choice fix