Fix issue with serialized choices
Fix issue with serialized choices

Acked-by: Stephen Cagle <06fa905d7f2aaced6dc72e9511c71a2a51e8aead@read-line.com>

talkiq/gaend,samedhi/gaend,talkiq/gaend,samedhi/gaend