Fixed another macro bug