Fix for proxy