Variable access fix