update proxy handler: old code is completely broeken.