Fix datagrid loading issue