Fixed macro redefinition