path fix and macro fix