Race Condition should be fixed now