Forgot a proxyIfNeeded somewhere