one more missing patch from new codegen path