Fixed bug with optional datafile fields