Bugfix: map/reduce