Update to work with VCS
fixes