Change macro signature for polling. No idea whether this actually works