Issue #21 fix for dynamic choices