Fix the dummy data reoccurance problem