Resolved compatibility issues with Scaffolding macro

Fixed in this release