Resolved issues with the setting of macro parameters

Fixed in this release