Mapping array done correctly