[Issue #110] fixing macro expansion bug.