VID-516 A little more debugging