Adapt to both outputs