Fixed bug with DW