fix a macro defect

this is a dangerous defect
Merge branch 'new_branch'
Merge branch 'master' into new_branch