[hotfix] wrong conditionalconditional OR to AND