Handle vcDiffwrapper properly.
Improved previous fix a bit and applied it to Decoder as well.