VID-1776 account for persnicketyness