Fix issue with macro