Fix sort on load