Fix the change in mapping API