Do not use sort property directly
Merge pull request #669 from yebblies/issue10318

Do not use sort property directly