Fixed the Race Condition.