Fixed variable issue