Better behavior when proxy changes