Issue fixed related to map iteration