Fixed macro replacing