Fix bug occurring when adding PropVars.
Refactor minor issue