Fixed slice of map issues