Toward resolution of ambiguity for the unfolded state.

Toward resolution of ambiguity for the unfolded state.