ENG-5540 Fixed VEM