Commit good fix for race condition Daniel noted