Temporary Fix to proxy and refresh timer