Work around ARQ-579