macro bug fix