Artifacts of tcf-1.6 #21