Fixed unmerged variables from previous commit