Fix order for map initialization