Fixing regression from recent VS changes