Fixing macro bug

See #40