Added fix for recursive error datasets.
Removed TODO comment.