DB/DW fix