Fix dataHelper part 1