vs fixes

vs fixes
merge