fix for duplicate macro