FW-238. Fix VS per Marcelo's suggestion.