Fixed macro expansion