fixed the issues with data getting