workaround virtuoso bug, partial revert of 42fcb284e9286265473787d4a281905ffdfb16db