Finish fixing location sort