Fixed #221 for one-based implementations of map and forEach