Fixes issue #1493 vap selects too much

Found this when I started looking at #1456 but never didn't get around to look at then one yet.