Bugfixes

This is actually a bug fix for another problem that was discovered in the process of working on VOV-1807. See VOV-1912 for details on the issue.