Added working proxy workaround