Added a patch to recognize variables with a vocabulary