BugFix: only keep objects of datasets