Fix overflow of vids at VWs < 831