really fixed Pandora macro