Fixing deprecated variable access without @