Fixed proxy handling