Issue #9: Fixed some bugs in DataCreator