FORGE-1802: Fixed possible CCE