Fixed broken variables