Fixed for() loop over ds_map