VID-814 More specific check