Fix issue #26 Ordering of choices not honored any more with v0.14