QA-fix db2 (part 3)