Fixed variable references