FORGE-1565: Fixed possible CCE