Fixed macro bug