Fix issues #67 - Fix wrong variable ref