Fixing QA (part2)