VID-1748 more hacking around