quick hack for VPC support