- fix macro logic
- rel 5