Fix VC instantiation bug
fix conflict