VID-1883 Don't do unnecessary checks