Workaround VS dependency problem