Fix bug for data load with custom - #7