fix macro problem
Others