Use new multiarch check only if no arch check fails