Assure origin order in maps