preserve order of locations!
Merge pull request #554 from ahgittin/fix/review

preserve order of locations