MYLOC-59 - Fixing ordering