JBIDE-18302 VPE: Fixing # issue for VPE