BugFix: make sure that dataset is always a number