fix Map and Set iteration
build