Feature/vov 1717

This should fix the build.