Merge "Fix Race Condition"