fix conditions after QA