macro redefintions fix