fixed generating choice conditions if the choice node is already part of an optional element
fixed generating choice conditions if the choice node is already part of an optional element