Fix some macro bug