Bugs fixes

Bugs fixes due to set_ and get_ choice ...