diff --git a/sql/SCOM/Maintenance Mode/1-current-maintenance-mode.sql b/sql/SCOM/Maintenance Mode/1-current-maintenance-mode.sql
index 99c8b04..56a3921 100644
--- a/sql/SCOM/Maintenance Mode/1-current-maintenance-mode.sql	
+++ b/sql/SCOM/Maintenance Mode/1-current-maintenance-mode.sql	
@@ -2,8 +2,9 @@ Select
 	vme.DisplayName,
 	vme.Path,	
 	vmet.ManagedEntityTypeDefaultName as 'Class',	
-	vmm.StartDateTime as 'Start',	
-	vmm.EndDateTime as 'End',
+        CONVERT(varchar(64), vmm.StartDateTime, 20) as 'Start',           
+	--CONVERT(varchar(64), vmm.EndDateTime, 20) as 'End',
+	CONVERT(varchar(64), vmmh.ScheduledEndDateTime, 20) as 'End',
 	CASE vmm.PlannedMaintenanceInd
 		WHEN '1' THEN 'Scheduled'
 		WHEN '0' THEN 'Unscheduled'