fix dbwipws for refactoring implications