Fix the get data issues