Resolved the compatibility issue with external gadget macros

Fixed in this release