Concurency bug fixed