Fixes issue #1493 vap selects too much
Merge pull request #1494 from Mharlin/master

Fixes issue #1493 vap selects too much