Ensure correct property sort order