Fix the dynamic generation of data