May Fix [DW-1679]
Shutdown Fix