Bugfix (or possible concurrency issue?)