VID-1582 Better comment