fix for hardcode in choice widget