Handle @ variables properly