Don't strip out the display part until after we've connected