QA-fix db2 (part 2)