Removed TODO
Fixed bug, wrong use of fold