Moves short-circuit to a better location in Adapter