I believe the bug (and others of this kind) are fixed with the latest commit to the "extended-macro" branch. I will do some testing before I merge it into "master".