Slightly better fix for proxy problem