Fixes offset drift caused by multiple macros in the same sub-macro replacement.
Merge pull request #906 from sorlok/double_macro

Fixes offset drift caused by multiple macros in the same sub-macro replacement