Fixed RaceCondition