Variable use fix