VID-1648 simplifying some logic