fix conditions after QA

agree.