More data bag fixing