fixup! reduce memory usage during fetch source sub phase