FormSchemaBuilder not working properly in FormEntry on OpenMRS 1.7

We are testing OpenMRS 1.7. After rebuilding all the xsns, the schema builder seems not to work properly. The order of the answers for certain questions are different on the form. So, schema validation errors will be displayed when trying to open the infopath forms under Form Entry tab.

Jeremy has revised the code to .getSortedAnswers() instead of .getAnswers() which the forms are now opened with no error.