Added some guards for que and vit