Re-introduce @base, marked as at risk