Another attempt at proxy support