proxy handling changed