Fixed: self now working in macro def