[WIP] Fixes #2360, changes to correct behavior of OVO in case of tie

See #2360 for discussion - currently fails tests.