Bugfix/vov 1956

This may still need a bit more tweaking to get right but we need to override the override (or figure out how to disable it in the first place)