fix ARB-only logic