bugfix race condition from atanas, see proxy