Corrected ordering issue with default property values.