Added hack for proxy