Forgot to refactor proxy