Fix bug with model default order