Make work with proxy

Temporary fix till I find a better way