Bugfix/vov 1866

There's stuff going on in this controller that should be handled in the model, but it's too deep to clean it up right now. This is a workaround, not a real fix.