Fix for ExportToExcel