Fix handling for VCL 4.0