method macro bug fix