Fixed ordered choice bug