Final fix for ArcGIS integration.