Fix issue with concurrent CR creation