Error fixed in macro check (by default)
Merge comments
Error macro fixed