fix for non-DW