fixes in data sample
for multiple version