QA scheme fix