Fix variable issue