Fix variable references
Fix variable reference