Fix #214

Macro expansion happens too soon