Vbvenuefix

Not intended to be merged, but opening a PR to compare for a solution to #80