Merge "Fix race condition"