fixed datagrid issue