Bugfix concurency exception