Pushed fix from bpedman for invalid VPC filtering