adding workaround code to fetch data