Fixed bug for real, same performance with files and dataset now!