VID-1013 Handle some weird cases