VS workaround