Make sure map objects are in the front
Put it in the if
Merge pull request #41 from LocalData/zonefix

Make sure map objects are in the front